Merge branch 'sprint/S1' into develop

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/CpsQuestionInfo.java

@@ -37,8 +37,8 @@ public class CpsQuestionInfo extends BaseMgrEntity<CpsQuestionInfo> {
     private String correctiveActions;
     private String effectVerification;
     private String controlStandards;
-    private String completionTime;
-    private Date controlArea;
+    private Date completionTime;
+    private String controlArea;
     private String knowledgeAccumulation;
     private Integer status = 0;
     private Integer status1 = 0;

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionUpdateService.java

@@ -13,6 +13,7 @@ import com.digiwin.athena.app.infra.entity.CpsQuestionInfo;
 import com.digiwin.athena.app.infra.service.CpsQuestionInfoService;
 import com.digiwin.athena.opt.common.eai.EAIRequest;
 import com.digiwin.athena.opt.common.eai.service.AbsEAIService;
+import com.digiwin.athena.opt.common.util.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -56,6 +57,7 @@ public class CpsQuestionUpdateService extends AbsEAIService {
                     break;
                 case "3":
                     o.setStatus3(1);
+                    o.setCompletionTime(DateUtils.getDateTimeNow());
                     break;
                 case "4":
                     o.setStatus4(1);

demo-athenaopt_backend/develop/src/main/resources/META-INF/dap.info

@@ -1,4 +1,4 @@
 #save dap.info
 #Sun Jan 29 14:54:12 CST 2023
-group.name=cim
+group.name=demo
 business.extension.layer=