|
|
@@ -52,6 +52,8 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.ZoneId;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -905,43 +907,33 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
|
|
|
* @return
|
|
|
*/
|
|
|
public List<HwContractTemplate> makeContractTemplate(HwOrder hwOrder, HwSubcontractor hwSubcontractor, HwUser hwUser) {
|
|
|
+ // 签署日期
|
|
|
+ LocalDate localDate = LocalDate.now(ZoneId.of("+8"));
|
|
|
List<HwContractTemplate> hwContractTemplateList = new ArrayList<>();
|
|
|
HwContractTemplate hwContractTemplate0 = new HwContractTemplate();
|
|
|
- hwContractTemplate0.setName("企业名称");
|
|
|
+ hwContractTemplate0.setName("firstpartytitle");
|
|
|
hwContractTemplate0.setValue(hwSubcontractor.getName());
|
|
|
hwContractTemplateList.add(hwContractTemplate0);
|
|
|
HwContractTemplate hwContractTemplate1 = new HwContractTemplate();
|
|
|
- hwContractTemplate1.setName("企业名称2");
|
|
|
- hwContractTemplate1.setValue(hwSubcontractor.getName());
|
|
|
+ hwContractTemplate1.setName("thirdpartytitle");
|
|
|
+ hwContractTemplate1.setValue("指定第三方");
|
|
|
hwContractTemplateList.add(hwContractTemplate1);
|
|
|
HwContractTemplate hwContractTemplate2 = new HwContractTemplate();
|
|
|
- hwContractTemplate2.setName("合作伙伴");
|
|
|
- hwContractTemplate2.setValue("指定第三方");
|
|
|
+ hwContractTemplate2.setName("servicerequirementname");
|
|
|
+ hwContractTemplate2.setValue(hwOrder.getHwRequirement().getName());
|
|
|
hwContractTemplateList.add(hwContractTemplate2);
|
|
|
HwContractTemplate hwContractTemplate3 = new HwContractTemplate();
|
|
|
- hwContractTemplate3.setName("服务名称");
|
|
|
- hwContractTemplate3.setValue(hwOrder.getHwRequirement().getName());
|
|
|
+ hwContractTemplate3.setName("contractsignyear");
|
|
|
+ hwContractTemplate3.setValue(String.valueOf(localDate.getYear()));
|
|
|
hwContractTemplateList.add(hwContractTemplate3);
|
|
|
HwContractTemplate hwContractTemplate4 = new HwContractTemplate();
|
|
|
- hwContractTemplate4.setName("合作伙伴1");
|
|
|
- hwContractTemplate4.setValue("指定第三方");
|
|
|
+ hwContractTemplate4.setName("contractsignmonth");
|
|
|
+ hwContractTemplate4.setValue(String.valueOf(localDate.getMonthValue()));
|
|
|
hwContractTemplateList.add(hwContractTemplate4);
|
|
|
HwContractTemplate hwContractTemplate5 = new HwContractTemplate();
|
|
|
- hwContractTemplate5.setName("甲方签署日期");
|
|
|
- hwContractTemplate5.setValue(DateUtils.date_sdf_wz.format(new Date()));
|
|
|
+ hwContractTemplate5.setName("contractsignday");
|
|
|
+ hwContractTemplate5.setValue(String.valueOf(localDate.getDayOfMonth()));
|
|
|
hwContractTemplateList.add(hwContractTemplate5);
|
|
|
- HwContractTemplate hwContractTemplate6 = new HwContractTemplate();
|
|
|
- hwContractTemplate6.setName("乙方签署日期");
|
|
|
- hwContractTemplate6.setValue(DateUtils.date_sdf_wz.format(new Date()));
|
|
|
- hwContractTemplateList.add(hwContractTemplate6);
|
|
|
- HwContractTemplate hwContractTemplate7 = new HwContractTemplate();
|
|
|
- hwContractTemplate7.setName("服务名称1");
|
|
|
- hwContractTemplate7.setValue(hwOrder.getHwRequirement().getName());
|
|
|
- hwContractTemplateList.add(hwContractTemplate7);
|
|
|
- HwContractTemplate hwContractTemplate8 = new HwContractTemplate();
|
|
|
- hwContractTemplate8.setName("企业名称1");
|
|
|
- hwContractTemplate8.setValue(hwSubcontractor.getName());
|
|
|
- hwContractTemplateList.add(hwContractTemplate8);
|
|
|
return hwContractTemplateList;
|
|
|
}
|
|
|
|
LiFei